From 3e924d1d37ceac44dd3d14f7e6ccd97cb6b3f8a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
Date: Mon, 25 Sep 2017 21:06:46 +0200
Subject: [PATCH] tests: move non-test binaries from here to ../tools

---
 docs/Makefile.am                          |  6 +++---
 tests/Makefile.am                         |  5 -----
 tools/Makefile.am                         | 12 +++++++++++-
 {tests => tools}/babl-html-dump.c         |  0
 {tests => tools}/babl_fish_path_fitness.c |  0
 {tests => tools}/conversions.c            |  0
 {tests => tools}/formats.c                |  0
 {tests => tools}/introspect.c             |  0
 8 files changed, 14 insertions(+), 9 deletions(-)
 rename {tests => tools}/babl-html-dump.c (100%)
 rename {tests => tools}/babl_fish_path_fitness.c (100%)
 rename {tests => tools}/conversions.c (100%)
 rename {tests => tools}/formats.c (100%)
 rename {tests => tools}/introspect.c (100%)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index e53d9a9..e612c7c 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,7 +1,7 @@
 # programs used for doc creation
-babl_fish_path_dhtml   = $(top_builddir)/tests/babl_fish_path_dhtml$(EXEEXT)
-babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness$(EXEEXT)
-babl_html_dump         = $(top_builddir)/tests/babl-html-dump$(EXEEXT)
+babl_fish_path_dhtml   = $(top_builddir)/tools/babl_fish_path_dhtml$(EXEEXT)
+babl_fish_path_fitness = $(top_builddir)/tools/babl_fish_path_fitness$(EXEEXT)
+babl_html_dump         = $(top_builddir)/tools/babl-html-dump$(EXEEXT)
 
 .SILENT:
 SUBDIRS=      graphics
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ac46eb7..5c3706c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,9 +44,4 @@ LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
 EXTRA_DIST=common.inc
 
 noinst_PROGRAMS =		\
-	introspect		\
-	babl_fish_path_fitness	\
-	babl-html-dump		\
-	conversions		\
-	formats			\
 	$(C_TESTS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7adce88..0872763 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,7 +3,17 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl
 LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \
 	$(MATH_LIB) $(THREAD_LIB)
 
-noinst_PROGRAMS = babl-verify babl-benchmark babl-icc-dump babl-icc-rewrite trc-validator
+noinst_PROGRAMS =		\
+	babl-verify		\
+	babl-benchmark		\
+	babl-icc-dump		\
+	babl-icc-rewrite	\
+	trc-validator		\
+	introspect		\
+	babl_fish_path_fitness	\
+	babl-html-dump		\
+	conversions		\
+	formats	
 if HAVE_SRANDOM
 noinst_PROGRAMS +=		\
 	babl-gen-test-pixels
diff --git a/tests/babl-html-dump.c b/tools/babl-html-dump.c
similarity index 100%
rename from tests/babl-html-dump.c
rename to tools/babl-html-dump.c
diff --git a/tests/babl_fish_path_fitness.c b/tools/babl_fish_path_fitness.c
similarity index 100%
rename from tests/babl_fish_path_fitness.c
rename to tools/babl_fish_path_fitness.c
diff --git a/tests/conversions.c b/tools/conversions.c
similarity index 100%
rename from tests/conversions.c
rename to tools/conversions.c
diff --git a/tests/formats.c b/tools/formats.c
similarity index 100%
rename from tests/formats.c
rename to tools/formats.c
diff --git a/tests/introspect.c b/tools/introspect.c
similarity index 100%
rename from tests/introspect.c
rename to tools/introspect.c
-- 
2.30.2